new resolve-git-conflict operator #1011
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduce new operator command
vim-mode-plus:resolve-git-conflict
It replace conflicting section with ours or theirs text, which to pick is determined by at which section cursor is placed.
In following text(NOTE:
0:
,1:
part represent row number, is NOT actual text)When executed, it replace whole conflicting section(row 1 to row 5) with ours or theirs.
ours
ours
theirs
theirs